Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Fuchsia to actually_monotonic #64198

Merged
merged 1 commit into from
Sep 6, 2019
Merged

Conversation

cramertj
Copy link
Member

@cramertj cramertj commented Sep 5, 2019

Fuchsia provides a fully monotonic clock.

Fix #64196

cc @joshlf @tmandry

r? @alexcrichton

Fuchsia provides a fully monotonic clock.
@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 5, 2019
@alexcrichton
Copy link
Member

@bors: r+ rollup

@bors
Copy link
Contributor

bors commented Sep 6, 2019

📌 Commit bb1e425 has been approved by alexcrichton

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Sep 6, 2019
Mark-Simulacrum added a commit to Mark-Simulacrum/rust that referenced this pull request Sep 6, 2019
…richton

Add Fuchsia to actually_monotonic

Fuchsia provides a fully monotonic clock.

Fix rust-lang#64196

cc @joshlf @tmandry

r? @alexcrichton
Centril added a commit to Centril/rust that referenced this pull request Sep 6, 2019
…richton

Add Fuchsia to actually_monotonic

Fuchsia provides a fully monotonic clock.

Fix rust-lang#64196

cc @joshlf @tmandry

r? @alexcrichton
bors added a commit that referenced this pull request Sep 6, 2019
Rollup of 10 pull requests

Successful merges:

 - #63676 (Use wasi crate for Core API)
 - #64094 (Improve searching in rustdoc and add tests)
 - #64111 (or-patterns: Uniformly use `PatKind::Or` in AST & Fix/Cleanup resolve)
 - #64156 (Assume non-git LLVM is fresh if the stamp file exists)
 - #64161 (Point at variant on pattern field count mismatch)
 - #64174 (Add missing code examples on Iterator trait)
 - #64175 (Fix invalid span generation when it should be div)
 - #64186 (std: Improve downstream codegen in `Command::env`)
 - #64190 (fill metadata in rustc_lexer's Cargo.toml)
 - #64198 (Add Fuchsia to actually_monotonic)

Failed merges:

r? @ghost
@bors
Copy link
Contributor

bors commented Sep 6, 2019

☔ The latest upstream changes (presumably #64209) made this pull request unmergeable. Please resolve the merge conflicts.

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Sep 6, 2019
@bors bors merged commit bb1e425 into rust-lang:master Sep 6, 2019
@cramertj cramertj deleted the fuchsia-monotonic branch September 6, 2019 16:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Add Fuchsia to actually_monotonic
4 participants